Merge cherrypicks of ['googleplex-android-review.googlesource.com/27728969'] into sparse-11945331-L10500030004449972. SPARSE_CHANGE: Ifb9689598031077c927c5910e1a6f04a6fddfc7d Change-Id: Ie30ee8cb9898464d744b4a02dd658218195686ca