Merge cherrypicks of ['googleplex-android-review.googlesource.com/24185697'] into sparse-10750808-L71400000962882290.
SPARSE_CHANGE: Ib78cdb211e25b1ae28d120a974514de4c6db8d43

Change-Id: Id8710801576f3b331da0d7014b124afc6b0cf8c8