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

Change-Id: Ic1d170e0340ffa5945ef8c0107de6ce163c71631