aml_hef_341415040
Snap for 10647597 from 2980b54dea97f7eb59075e2836a0e1d8e1d74cdf to mainline-healthfitness-release

Change-Id: I4ca2cb563efd5e9bee4cf48729d7651017aaa56e