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