Merge cherrypicks of ['googleplex-android-review.googlesource.com/24454827'] into sparse-10644925-L51500000962610728.
SPARSE_CHANGE: I7e38dc60dfe6c726bd20b8960f484799b743084a

Change-Id: I132a2b3b32376a75683e6cd4fdb10b8d54513349