Merge cherrypicks of ['googleplex-android-review.googlesource.com/25827196', 'googleplex-android-review.googlesource.com/25829031', 'googleplex-android-review.googlesource.com/25829032', 'googleplex-android-review.googlesource.com/25831333'] into 24Q1-release.

Change-Id: Ie403608528856f1d049a1c166d602e3055788f7c