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

Change-Id: I00a0befcaba506213c989d6f9b45145e90c77103