Bug: 143531081 Test: Manual Change-Id: I342a1e5eefc59d25a8bea1c0fe72b8669bfdbe84
Bug: 110275838 Change-Id: Ica7a3bd2e1661954398010e5eff150dea20a3bd5 Test: on 2 emulators and 2 hardware versions (cherry picked from commit d879e7e0f5c13409f13c58ec88376ec807a691cc)