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

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

Change-Id: I05c9c6ba034973f9aa2376fdd80a6217e7bed0e9