frc_340819190 (10894928,com.google.android.healthfitness)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24163523'] into sparse-10538012-L23300000962128189.
SPARSE_CHANGE: I7cea7cda5850d88fcf9d3b597a8dc4deec7f6bce

Change-Id: I6b0b1db64bfece14b2015450ccafe82cebcc99e3