Merge cherrypicks of ['googleplex-android-review.googlesource.com/33010780', 'googleplex-android-review.googlesource.com/35064855'] into 24Q3-platform-release. Change-Id: I85525b06b5bea57d16d5377b6fabd400c7bd1078