Merge cherrypicks of ['android-review.googlesource.com/2569893', 'android-review.googlesource.com/2574430', 'android-review.googlesource.com/2572133'] into sparse-9946294-L35000000960520556.
SPARSE_CHANGE: I1b2c317e21db118e4b957804feb76f266d887b20
SPARSE_CHANGE: I77e0706f413ce9defb174f00ee145dcc01f5d780
SPARSE_CHANGE: Ic7188f9d8ccfcd90d844b45e3b370a3be3c515d6

Change-Id: Ie45a24d782b7322c65b995b9e09b9f1135061db9