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

Change-Id: I97ec75ef4f6315af0586c9967a4d62dbb3c29ecd