Merge cherrypicks of ['googleplex-android-review.googlesource.com/27813145'] into 24D1-release. Change-Id: I2f31195dbb43db4cdc5f253dcb131bb25606b3f1