Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436880'] into sparse-10754064-L40700000962919403. SPARSE_CHANGE: I8bd0f5ef94ca1d5e118a701a4cfff58599537476 Change-Id: I6ac1a5c9a094b4838f8106f024f44bdc6db35952