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

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

Change-Id: Idece32f2a0f37fdc4e5044797eaa4a561b1bd2bb