Merge cherrypicks of ['googleplex-android-review.googlesource.com/27695361', 'googleplex-android-review.googlesource.com/27697196', 'googleplex-android-review.googlesource.com/27697315', 'googleplex-android-review.googlesource.com/27697199'] into sparse-12025142-L68100030004806002.
SPARSE_CHANGE: I2f0f9681455968cdaed4a74d3a77c0b2de1ba14b
SPARSE_CHANGE: I18527bb9a4358c14b2e99646670f0ab2da8173f0
SPARSE_CHANGE: I2bdfbbed0dff3c3c093dd46200f2d8ce15c28652
SPARSE_CHANGE: Icb9de546d095ed4d97e52cc32c1b034856ccd6fb

Change-Id: Id1dd97541f29b3930fd5ccc950473c58aadf0106