Merge cherrypicks of ['android-review.googlesource.com/3133197', 'android-review.googlesource.com/3133375'] into 24Q3-release.

Change-Id: I101194338a4a6ea49c84bd9800ff28d55598c0ee