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

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

Change-Id: I7bbb40b87e0b4edd33169a2827f00e157a93f293