Merge cherrypicks of ['googleplex-android-review.googlesource.com/22713702'] into sparse-9957400-L29100000960006895.
SPARSE_CHANGE: I3e7c3b5d7e7f5a3f841e020b671b3ea81c1d9262

Change-Id: I04564ff061b48eace58c6d59f36a36ada9a6e3d2