aml_hef_341415040
Snap for 11171363 from 97a62c94b1fcf9a1f99857b1d2b55f47129dd468 to mainline-healthfitness-release

Change-Id: Ib02b8bea2d28c874910a285945c0c48f62e8084c