Merge cherrypicks of ['googleplex-android-review.googlesource.com/27974984'] into sparse-11997097-L62700030004712292.
SPARSE_CHANGE: Ia5a2f0fc6c7b98a09163136a41121058c0faff36

Change-Id: I7364af852d8d90c8455ddd50bba5bd42c7e4629d