Merge changes Ic4afb996,I9792e14a am: b4b43a5209

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

Change-Id: I0ec9a64a77a2c0c2712294724d458cf920d9abae