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

Change-Id: I394b99cb8f36c5312c96609149a68e6262df6b4e