Merge cherrypicks of ['googleplex-android-review.googlesource.com/33532742'] into sparse-13113456-L39600030012728610.
SPARSE_CHANGE: Iafff0c2939225431019c233dda51fe43e008e240

Change-Id: I01dadabf1fbaa3de9b807711d0fcbbcfb9606ac5