Merge cherrypicks of ['googleplex-android-review.googlesource.com/26918636'] into 24Q2-release. Change-Id: Ib0998eb177da06da2cc961d643ee3d7e72085786