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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27955216', 'googleplex-android-review.googlesource.com/27950608', 'googleplex-android-review.googlesource.com/28037860', 'googleplex-android-review.googlesource.com/28051600', 'googleplex-android-review.googlesource.com/28071111'] into 24Q3-release.

Change-Id: I466682aad7988db6d57bbedc1e5dd478cf61dcc7