Merge cherrypicks of ['googleplex-android-review.googlesource.com/27829737'] into sparse-11963768-L48200030004546227.
SPARSE_CHANGE: I55c23afc0c338c6c009b99822780f1998d4a624b

Change-Id: I634fff3d6b6f4392dffab3a0ee8082f0a6eefe3e