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

Change-Id: I8deecc5678615a07760a8c9220e7a0dfa3101c37