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

Change-Id: I388c7f4ea6e4bf14c1fdd6202c7bc2703bd06fe2