Merge changes I1e45d3ef,I4117f5d9 am: c37be89c82

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

Change-Id: Ie067ce8d4953d5e56eebedca290f2cafd1052a81