Merge changes If5292d1d,Ib1a86d48 am: d4b099d3fa

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

Change-Id: I4ca7e64d6f0a21b119d52648352c6a28274898ea