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

Change-Id: I133bfcfbdb5c36c6056479f992b581bc844aec3f