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

Change-Id: I4b8b86b0dd1bd221ac72b37ddb36b5d6b780c6ea