Merge cherrypicks of ['googleplex-android-review.googlesource.com/23809847'] into sparse-10317220-L65500000961600299.
SPARSE_CHANGE: Ia8f9db8eb23134db3eef2c7354da1f7ec3946f51

Change-Id: I13c6e332e963d0fcb13edfc515177a2b7764022a