Merge cherrypicks of ['googleplex-android-review.googlesource.com/24465029'] into sparse-10644925-L49500000962635927.
SPARSE_CHANGE: I1a19f339b94917b46c0f9fd5fb6db9404a8dfc0e

Change-Id: I8e0696dba006467c422943f3194c3a3fc50781a3