Merge changes I1b8e0272,Ia07d0d3b am: 30c1fd8055 am: 645c3c8318

Original change: https://android-review.googlesource.com/c/platform/development/+/1345398

Change-Id: If086ad0e947436ebdfa771371361c0023446e59a