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

Change-Id: I98bf3afe7b98e3bf3cdafd432fb5e2a76abaaa13