Merge cherrypicks of ['googleplex-android-review.googlesource.com/22896125'] into sparse-10161073-L49900000960778179.
SPARSE_CHANGE: If49dce98f3155f3144a766c26b5a3a39401ce1b2

Change-Id: Id5d46d8bedbda87c2c7a74cfb0c1ac48be367b52