aml_hef_341415040
Snap for 10460766 from f1e31ae6ed39c2c8a91fa7ac3755464e70b124ed to mainline-healthfitness-release

Change-Id: I7cd274a3fa2cfd24c48cd3989cdcf70b8909efb6