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

Change-Id: Idf4d1141b3a32b769b2052eb62d573dfc045c376