aml_hef_341415040
Snap for 11166233 from a9f7c582b2b834d334989bcf517d203e8508c1a0 to mainline-healthfitness-release

Change-Id: Ie1df2573cb596107eedd34d1cf2b328749d92b7b