Merge cherrypicks of ['googleplex-android-review.googlesource.com/29666657', 'googleplex-android-review.googlesource.com/29667000'] into 24Q4-release. Change-Id: I862515a5b0d16066883f8b4d6c2cf9c219bdb267