Merge cherrypicks of ['googleplex-android-review.googlesource.com/28919701'] into 24Q3-release. Change-Id: I22b2acffedba50535fca31a19da268c7e8b1750a