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