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

Change-Id: I72e04c9335cf521499350cc1fdf0ef8dde1960fb