aml_hef_341415040
Snap for 10750748 from 679a7b2f030e3811341bac059011365a4c63f89b to mainline-healthfitness-release

Change-Id: I47262e3f18b2ff3f9845df478928ae5c256c7a9a