Merge changes Icdf88bc3,I368e905a am: d3675725b8

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

Change-Id: I51fddaa0a19a8812a426b212e33aae8b532b462f