Merge changes If1ccc3d9,I198bf3e1,I0d903c16 am: a12115812c

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

Change-Id: I8587548ab48c84f4cd5bd5a6f3eb71f656738a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>