Merge cherrypicks of ['googleplex-android-review.googlesource.com/33320898'] into sparse-13425744-L97400030011689433.
SPARSE_CHANGE: Iead9c06835a227ae870ba71d70a9e9461ef64be9

Change-Id: I49b425dc1c7d50cd7ef1e0dbea4b880633dd021c