aml_hef_341415040
Snap for 11119596 from e546ccacd3177e86ab7cd5ff1c457748313a750f to mainline-healthfitness-release

Change-Id: I25ad8a98c71b65df43071d0dd9ed5e3194fdea2c