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

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

Change-Id: I967c9f3b461452d029e722be68e018433b2a64e4