Merge cherrypicks of ['googleplex-android-review.googlesource.com/26928859'] into sparse-11973172-L93500030004728592.
SPARSE_CHANGE: I0bcd3ba4ad5ee89653447e8119868deec2175a07

Change-Id: I37b98d23fc46de6eaafef85fc76bbde76ed7c4bf