aml_hef_341415040
Snap for 11018792 from a6aeac644e337188b5e0d6f4b79cbee16a75ab7b to mainline-healthfitness-release

Change-Id: I812ca6b213b57999cc190ca13f143789f5120c79