Merge cherrypicks of ['googleplex-android-review.googlesource.com/31014284'] into sparse-13009785-L02100030009347264.
SPARSE_CHANGE: I7b3ac7114d519be9f46d0c38758bdcc7239d033a

Change-Id: I8eb67d76d2cf8926a2a7ebcfd075604aebf1f241