Merge cherrypicks of ['googleplex-android-review.googlesource.com/27148929'] into sc-v2-platform-release.

Change-Id: Ifa9837e80f2b6707789f613646b9e32cc2ef0a78