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

Change-Id: I8f59672742d8879d94225b89cfbb6c0ed88e8a32