Merge cherrypicks of ['googleplex-android-review.googlesource.com/28421207', 'googleplex-android-review.googlesource.com/28421209'] into 24D1-release.

Change-Id: I7a1660f0a8039ea4855181fcefc3c23226444d09