Merge changes I84bfadd3,I150677ff am: ffdba5d2c5

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

Change-Id: I960de897dd9ba0c8cd17cd767ada83a3211f4f7a