Merge cherrypicks of ['googleplex-android-review.googlesource.com/23554146'] into sparse-10252186-L42700000961059379.
SPARSE_CHANGE: I2ee30dfa5e4170272b5353f270a69b38750a0bd5

Change-Id: Ibcd59f63194e106161ddecfe0e39db5af5223089