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

Change-Id: I1a60bc5f2efad8d32b41a68a36251f41535a0034