Merge cherrypicks of ['googleplex-android-review.googlesource.com/35164126', 'googleplex-android-review.googlesource.com/35805584', 'googleplex-android-review.googlesource.com/36005285'] into 24Q3-platform-release. Change-Id: Ib6dab43abb10955b03b401042059cd623e50a7ed