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