aml_hef_341415040
Snap for 10983763 from b69c7b025f8f81e579a4cbfb05876302fb6f964e to mainline-healthfitness-release

Change-Id: I58ae85849d08201ec88a02e4fbddc32f0b831d9e