frc_340819190 (10894928,com.google.android.healthfitness)
Snap for 10078606 from fc2ed9adc55d8a412abba7ebe1620d366b4bd75b to aml-frc-release

Change-Id: Ifa6727ff2078d2f3f3b18356fe66b1778653d5f0