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