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

Change-Id: Ida44fe5e0a853ea8cea1578c548f8d93ced9bce4