Merge changes I47b4756d,I0564369e am: f486885133 am: 39e7a58749 am: a150d58370 am: f3c7c0d3ef am: 71194cd9f1

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

Change-Id: I5ee890a18a926c2fb5e3a95c0c0d44f223e75cd2