Merge cherrypicks of ['googleplex-android-review.googlesource.com/28436805',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28436805', 'googleplex-android-review.googlesource.com/28751284', 'googleplex-android-review.googlesource.com/29052895', 'googleplex-android-review.googlesource.com/29447771'] into 24Q3-release.

Change-Id: I96b756e86ef160e3129b0c1ab8e1d7efee705c1a