Merge changes Ice2c3a8a,I5c4f16af am: 53f2408738

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

Change-Id: I6aa9d1766bc90a54011fc834c7f4bf130804b0d8