aml_hef_341415040
Snap for 11166233 from 1e019f117ff26cdefc697ba17326c8c08ac9a7c0 to mainline-healthfitness-release

Change-Id: I3a562730f2607c969f3007f70c01e8872da97b6a