aml_hef_341415040
Snap for 11086793 from 783e2c3627915fd29852c849da0214375b0525ff to mainline-healthfitness-release

Change-Id: I7627c5bac95d5baf99a966a015ea7bf531e7ebd0