Merge cherrypicks of ['googleplex-android-review.googlesource.com/23214526'] into sparse-10121037-L10400000960889242.
SPARSE_CHANGE: Idd5c7d8e8446219b728c87314272f81a676bdd12

Change-Id: I97f97d7e531be9855862a75cc6ceac22075ca244