Merge changes I8c70f568,I96c43cff am: 9dadf3459f am: 99b8956df6 am: 1a75277c5a

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

Change-Id: I0f10e5c1704850149c480798b113e13f3770a9bc