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

Change-Id: I6071d2b93c9bf7338cba8f3317493f512f790f26