Merge cherrypicks of ['googleplex-android-review.googlesource.com/29776393', 'googleplex-android-review.googlesource.com/29910957'] into 24Q4-release. Change-Id: Ic205b2adb1aed9ffa4a53c023aef18b69af69da0