aml_hef_341415040
Snap for 10632790 from 1bbd98fc27417104182c366a380f3134ba8de77b to mainline-healthfitness-release

Change-Id: I835fd5407b331bc9d813a567aae0ad13093a25b6