aml_tz4_332714010
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26226320', 'googleplex-android-review.googlesource.com/26256297'] into sparse-11351934-L03000030002032845.
SPARSE_CHANGE: Iaa6859d792626a0f5b3ce1b92521b380421c52ab
SPARSE_CHANGE: Ifed5f071725d0c1960ce186623ad4c966c5f8fdd

Change-Id: I5017f271fc75ef7892c3e6cb82f81df2222eaada