Merge cherrypicks of ['googleplex-android-review.googlesource.com/25176955'] into sparse-11010452-L16800000963750677.
SPARSE_CHANGE: Ia1f09da58824a8300e364bd3236fad0685ee5508

Change-Id: I59a939e4bbd73c701d452bf3ae11dce38711a6be