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