Merge cherrypicks of ['googleplex-android-review.googlesource.com/29779918', 'googleplex-android-review.googlesource.com/29911388'] into 24Q4-release. Change-Id: I94aa7a459b6688f81a844fa7641cdd0414570287