Merge cherrypicks of ['googleplex-android-review.googlesource.com/21411280'] into sparse-9721558-L05300000959046533.
SPARSE_CHANGE: I8acb3306d89fcc48bb2f435663e2736c92436227

Change-Id: I29c1b4199fcdfa8b70ceea99637c53f5bdbd5ba7