Merge cherrypicks of ['googleplex-android-review.googlesource.com/24056558'] into sparse-10502572-L39700000962039696.
SPARSE_CHANGE: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f

Change-Id: I38720247bf3f5ca08e59bcc570558e456c88c411