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

Change-Id: I395fd4ce0ce46e4210735f3ccfb0161baf8cc7f1