Merge cherrypicks of ['googleplex-android-review.googlesource.com/29670750', 'googleplex-android-review.googlesource.com/29670755', 'googleplex-android-review.googlesource.com/29670967'] into 24Q4-release.

Change-Id: I199bb3bc142b3b8296d9a9c9dcd6382a06c69023