Merge cherrypicks of ['googleplex-android-review.googlesource.com/29616053', 'googleplex-android-review.googlesource.com/29656286'] into 24Q4-release.

Change-Id: If5fb394c4a29ca3153eecdc894f54321dbaa3927