Merge changes Ib6be1671,I08c5ab16 am: 1ca6a33b31 am: 967df69e84

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

Change-Id: I43a2f60567c797b134ef1e2bae394eb303c0c156