Merge changes If5292d1d,Ib1a86d48 am: d4b099d3fa am: 6c8990d3a8

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

Change-Id: I35de4f333a2437103d21ddade20fe8c553873f9c