Merge cherrypicks of ['googleplex-android-review.googlesource.com/27093961', 'googleplex-android-review.googlesource.com/27095342'] into sparse-11860263-L41200030004374858.
SPARSE_CHANGE: If58957f829a5e1e7ce3180dcff86a1fc67cb0263
SPARSE_CHANGE: I4f73498adb2f1dd69794889c1d9311d5d81cacaa

Change-Id: I223f427681d9c563f6a7dc46b09cffdd08ec6222