Merge cherrypicks of ['googleplex-android-review.googlesource.com/26247756', 'googleplex-android-review.googlesource.com/26463011'] into sparse-11583385-L27700030002950478.
SPARSE_CHANGE: I84212cd2b6e36d162d6f6624a21f393e0ec0d070
SPARSE_CHANGE: I80ca14c7073707ef69dd3feef8f7731afbe09582

Change-Id: Ia47a95ee4a072dcebabcf4226e5458ef09c51fb2