Merge cherrypicks of ['googleplex-android-review.googlesource.com/24377484'] into sparse-10615833-L02900000962494793.
SPARSE_CHANGE: Ibd4d143838b7cafcfd85a40541295c3332b7be08

Change-Id: Ib4e0c5d297311677bdedd0f05fb35d848359abc7