Merge changes Ic4afb996,I9792e14a am: b4b43a5209 am: ed19a49dbf

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

Change-Id: I28c211d98ce41c9fcac2b793f3fa225207177305