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

Change-Id: I9cba701f33997930bc0f0acb7dd17a5407fe0afb