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

Change-Id: I7b86e32893c506c65f919ae99caff740dba69b6d