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

Change-Id: Ib66a1625df2f87ce860e015ec0a3d2b9876b4b16