Merge changes I8449eea7,I24666871 am: 5d8768f2ca am: 303ca2baa8

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

Change-Id: I815ef03c93bec8be2340dc340d840895f47ecafe