Merge cherrypicks of ['googleplex-android-review.googlesource.com/23556080'] into sparse-10316531-L15400000961262887.
SPARSE_CHANGE: I78cce2638a15b48add7176c4ae037b317336789f

Change-Id: Ifb276f701651619d498316ffc6cd512b866d2a4b