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

Change-Id: Ic667c93c65571cc6fb64a6f3fba832f2b59faa63