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