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