Merge cherrypicks of ['googleplex-android-review.googlesource.com/30939547', 'googleplex-android-review.googlesource.com/30939548'] into 24Q3-platform-release.

Change-Id: If04722b4717fedad2038343af33f3b380e39c4cd