Merge cherrypicks of ['googleplex-android-review.googlesource.com/24525894'] into sparse-10707719-L62800000962763799.
SPARSE_CHANGE: Ic2453f6c369a1e9b72da27737f80c875d6264bce

Change-Id: I7ecd3b71f5539d5dca60ac3d5d5bf66f10d489ce