aml_hef_341415040
Snap for 10460766 from adc8f0c565cf01c1ba838e9390bac1166f67eea8 to mainline-healthfitness-release

Change-Id: Ic2604e8dd3cbadc5b4abc668552e94a677246e22