Merge cherrypicks of ['googleplex-android-review.googlesource.com/24592571'] into sparse-10726908-L58700000962857713.
SPARSE_CHANGE: Ib7ae8d4e13ae10316ee8693a496e866dcd574562

Change-Id: Ifc5201fa04cab3df319b55173b6fc22776a794ee