Merge cherrypicks of ['googleplex-android-review.googlesource.com/24592571'] into sparse-10726858-L87700000962857159.
SPARSE_CHANGE: Ib7ae8d4e13ae10316ee8693a496e866dcd574562

Change-Id: Ied220298d0ab571cb685415ec85b5fa0c58b7a3b