Merge cherrypicks of ['googleplex-android-review.googlesource.com/33153634'] into 25Q2-release. Change-Id: I6eccfa805014ca464062d105f647cab75035abe7