aml_hef_341415040
Snap for 10460766 from 308389e675a7a30140bcfbe23fbfbfca103d6fc5 to mainline-healthfitness-release

Change-Id: I9d9d62ebd8643e9b2ab7c250a083c559a9c3172a