Merge cherrypicks of ['googleplex-android-review.googlesource.com/28052813', 'googleplex-android-review.googlesource.com/28129527'] into 24Q3-release.

Change-Id: I4bd44147257961f23964095f17e07d948ed22277