frc_340819190 (10894928,com.google.android.healthfitness)
Snap for 9912757 from 8b40bd1e6f5a15e69041056ac9c727434beef1f6 to aml-frc-release

Change-Id: I066ac8e6511e78dee6792262129ca309d613df20