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

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

Change-Id: I19575fba56d4fb244e9646e46105a29242e59319