Merge changes I8c70f568,I96c43cff am: 9dadf3459f am: 99b8956df6 am: 1a75277c5a am: 246e649b77 am: 4675e8f37e

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

Change-Id: I33ca2b7e1f1e9ece44564b4d78a96359a465401c