Merge cherrypicks of ['googleplex-android-review.googlesource.com/22633469', 'googleplex-android-review.googlesource.com/22438869', 'googleplex-android-review.googlesource.com/22625067', 'googleplex-android-review.googlesource.com/22772854'] into sparse-10161073-L38600000960763138.
SPARSE_CHANGE: Iede626004a1ea46f47b185777c97794e4d3ded4e
SPARSE_CHANGE: I8c1b858c8990c60cea48a59fc390f57a40ed86ba
SPARSE_CHANGE: Id37e395f4f4f05b7901b718e3ea84c56b95cdfe7
SPARSE_CHANGE: I224c80e2787497634d3e68760122dac5f177585a

Change-Id: Ib48f33864b4cd74976398ff8ab3707fc2d75419e