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

Change-Id: I3acfde3a699eb76e996fe7d5897372509a0d3844