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

Change-Id: Ieea5ee5950188b3b3317c547c805eb7827ae51cf