Merge "Merge cherrypicks of ['android-review.googlesource.com/2388225', 'android-review.googlesource.com/2391933', 'android-review.googlesource.com/2406112', 'android-review.googlesource.com/2404652', 'android-review.googlesource.com/2412813'] into sparse-9492874-L46600000958426283. SPARSE_CHANGE: I87e8a36e0f84a43d71926b9c21f1434c85dbea9e SPARSE_CHANGE: I217dfe39f1ac4032f3c52cc19618fec83516c9b8 SPARSE_CHANGE: I29ddee5affc7fe0a5f6ec5ecd776d39ff5e9c138 SPARSE_CHANGE: I7ab4c315f56a711e91b13f8ff8e7a4cbe8fcd989 SPARSE_CHANGE: I3d9b1e687f6b7ea797113385abbec56dd5d0ee60" into sparse-9492874-L46600000958426283