Merge cherrypicks of ['googleplex-android-review.googlesource.com/26969944'] into 24D1-release.

Change-Id: Ia487fb3d1ffb1d7514b47f761da73e072c73c394