Merge cherrypicks of ['googleplex-android-review.googlesource.com/32875900', 'googleplex-android-review.googlesource.com/34169339'] into 24Q3-platform-release.

Change-Id: I25895d8d30f6372a55c8e243afd13b95f32e745e