Merge cherrypicks of ['googleplex-android-review.googlesource.com/26065016',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26065016', 'googleplex-android-review.googlesource.com/26079955', 'googleplex-android-review.googlesource.com/26079956'] into sparse-11373123-L83400030001691355.
SPARSE_CHANGE: I5371984cd509703d79409e57b99678a65001695e
SPARSE_CHANGE: I916a54546053985f773d187010dbe5e3f2f137ba
SPARSE_CHANGE: I20dc46965b0f6467bdb8a8d0fa213480f59e4492

Change-Id: I1ac436d11479a89a1e78b71f68f09664ec295786