Merge cherrypicks of ['googleplex-android-review.googlesource.com/25201937'] into sparse-11049176-L05200030000080823.
SPARSE_CHANGE: I64897baeaa0b5d81c904d75f2b1e17c0eefec3bf

Change-Id: I4a5eb219bc198d2edad0be83f7f69feb317883d1