Merge cherrypicks of ['googleplex-android-review.googlesource.com/39080685', 'googleplex-android-review.googlesource.com/39234235', 'googleplex-android-review.googlesource.com/39242056', 'googleplex-android-review.googlesource.com/39309043', 'googleplex-android-review.googlesource.com/39309198'] into 26Q2-release. Change-Id: I2cc26c1b69e78e7149d1f071a7fc9ce0bc6c2844