aml_hef_341415040
Snap for 11171363 from 32f5dd7f7f3ebe64ad61e77415eecf33f2079603 to mainline-healthfitness-release

Change-Id: I057232d7bf95af20eb8ea35245aca02f9095cf5c