Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436878'] into sparse-10754064-L40700000962919403.
SPARSE_CHANGE: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3

Change-Id: I4d69a9a555eea31098dd1dcdd1f447601dc9d76a