Merge cherrypicks of ['googleplex-android-review.googlesource.com/29779920', 'googleplex-android-review.googlesource.com/29908258'] into 24Q4-release. Change-Id: Iaa36d754a6dd52f10f26f91863fcf1e3da7de7d8