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

Change-Id: Iebff7544206a723d0e7b3d917d2caf1cdfa44d9d