Merge cherrypicks of ['googleplex-android-review.googlesource.com/33315431'] into sparse-13775243-L92100030014435199.
SPARSE_CHANGE: I7510c167e3f063ac48840bc9ccab66ab26d046ce

Change-Id: I2c73f1b5b884a8b1157ccc333c4be446d12547e7