Merge cherrypicks of ['googleplex-android-review.googlesource.com/26227895', 'googleplex-android-review.googlesource.com/26253941'] into sparse-11351934-L03000030002032845.
SPARSE_CHANGE: I7b4e7118c3b9ca8c9d88b126b9addc51a263df3a
SPARSE_CHANGE: I1951ee8c6898191c27499d83b2fe276e32a0e3ab

Change-Id: Ie35495a1282421d105858add480d17c9af516c76