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

Change-Id: Ib91ae5a04da959c23d0f6b01abd6a6f63a15f7e9