Merge changes I1f5cebbc,I43a031a5 am: 99c24dc5b6 am: 46d947a2be

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

Change-Id: I7534401706af6c1f6d5890d4b560a9ce72574279