Merge cherrypicks of ['googleplex-android-review.googlesource.com/29580618', 'googleplex-android-review.googlesource.com/29602630', 'googleplex-android-review.googlesource.com/29601058'] into 24Q4-release.

Change-Id: Ib6e08f0abb1c58810230f9e5ddd64691a32a12fb