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

Change-Id: I2dbaf8e3490e6e13dde889fbf79d37577df22e9e