Merge changes I68491288,I54af3603 am: 595154fc79

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

Change-Id: Ia58cd88c6852d4f69503b8d347554c91a203849b