Merge changes I8c70f568,I96c43cff am: 9dadf3459f

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

Change-Id: I3e2ee4a9dad4c9203874cdde8e2a377feb483615