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

Change-Id: I4e70b4d534dbcc1a859e8a35bf64225a08959f3a