Bug: 110118705 Bug: 110761200 Test: partners verified Change-Id: I946c645af0cfb3f3b0e9344c51940da226fd08ce