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

Change-Id: Ib1453ac3d6a0f7f7acf78a5d2ca087e9188e3d1e