Merge cherrypicks of ['googleplex-android-review.googlesource.com/21359391'] into sparse-9595452-L17000000958584414.
SPARSE_CHANGE: Ib139ffefb389c38388d6e1c9eeff7293c1412adf

Change-Id: I4c206e7a4554e28a64749005293a768e778650a2