Merge cherrypicks of ['googleplex-android-review.googlesource.com/21693196'] into sparse-9719927-L72800000959038993.
SPARSE_CHANGE: If9eba1862e49fe31462b8f114b459c21e95d4549

Change-Id: Ic38d13d1309b15f74ab5f12913a5a8d9fdff7562