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

Change-Id: I3dde9c195504e3517fb2cf1a3b1ea46a0db9ebdd