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

Change-Id: I46611fd3e6c0cc7fcd25a67a3172c220d2e0cad5