Merge changes I1f5cebbc,I43a031a5 am: 99c24dc5b6 am: 46d947a2be am: df3ab60e7c am: b029d0772a am: 51d288035c

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

Change-Id: I47a8f138bf89d4977a92617b24a59c1d49e455ef