Merge cherrypicks of ['googleplex-android-review.googlesource.com/36064311'] into 25Q4-release. Change-Id: I5d43b94dfe058ba50bedc8af5b775193b1fd4717