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

Change-Id: I500be03a228ecb4bc4d1d79f25c9651b7b111ec3