Merge cherrypicks of ['googleplex-android-review.googlesource.com/36456371'] into sparse-14491201-L17700030063614037. SPARSE_CHANGE: I6efecac362757c10b2308d020440eac5edc5b873 Change-Id: I68eeda016e1b51355e184fe4b12a7fe04b961361