Merge cherrypicks of ['googleplex-android-review.googlesource.com/36017795', 'googleplex-android-review.googlesource.com/36999445'] into 25Q2-release. Change-Id: I680aad6abf3808dc57233f5280f734e4a470af3f