Merge cherrypicks of ['googleplex-android-review.googlesource.com/23583481'] into sc-v2-platform-release. Change-Id: I8b18451ed3f263f4d80c6af6ff60c5ac046e8c63