Merge cherrypicks of ['googleplex-android-review.googlesource.com/23657638'] into sparse-10333960-L74700000961328198.
SPARSE_CHANGE: Ie18611e74b628b192073fe67549a04614de79fa1

Change-Id: I7ce51cd7f613065ad13077703fbc801173476893