Merge cherrypicks of ['googleplex-android-review.googlesource.com/29780651', 'googleplex-android-review.googlesource.com/29910556'] into 24Q4-release. Change-Id: I23fc26aeec0573ff9ce18965714b6c996312f68c