frc_340818170 (10768146,com.google.android.art)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24163523'] into sparse-10539571-L41800000962131767.
SPARSE_CHANGE: I7cea7cda5850d88fcf9d3b597a8dc4deec7f6bce

Change-Id: I3abdfdc4d09d91f1618e904b9703c58885010187