Merge changes I1e45d3ef,I4117f5d9 am: c37be89c82 am: 48666960dd

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

Change-Id: Ib892cf002e5a290f151b481b8f438efa4f8b9052