Merge cherrypicks of ['googleplex-android-review.googlesource.com/26226319'] into sparse-11296643-L88600030002056189.
SPARSE_CHANGE: I228d5991c685a35989f7c0fccb6647afb938520e

Change-Id: If80494a0b0f1058f6fec08bb149a4554f2f2d060