Merge cherrypicks of ['googleplex-android-review.googlesource.com/28018576', 'googleplex-android-review.googlesource.com/28016799', 'googleplex-android-review.googlesource.com/28016802', 'googleplex-android-review.googlesource.com/28157898'] into sparse-12044017-L62100030004952862.
SPARSE_CHANGE: I95e51fcdf53b3e137565bc2e47ca67755904f369
SPARSE_CHANGE: I8a718690fc392294b958a9487a679d7c7aec0a7b
SPARSE_CHANGE: I0807bf4f0be5d5de3429168ce7a89fa79946a2cf
SPARSE_CHANGE: I2fb755d247f2efffa2f1c84322b52d33367d5cdb

Change-Id: I16009d9d1052b506a123776bad08b97fd0915aef