Merge changes Icdf88bc3,I368e905a am: d3675725b8 am: d354d0a15b

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

Change-Id: Ibfaf1fdb7940bab487496e1f79692170902227b6