Merge changes I47b4756d,I0564369e am: f486885133 am: 39e7a58749

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

Change-Id: Ie7b51080ffe15b69bbff2f36218ae94988fdb2f4