Merge cherrypicks of ['googleplex-android-review.googlesource.com/26518908'] into sc-platform-release. Change-Id: Ibe38ffb345bf6ef8c15802f32400534b986cfa42