aml_hef_341415040
Snap for 10460766 from 25f2d269e38d88e4543bd75e02e127ba0a0d6a49 to mainline-healthfitness-release

Change-Id: I5231ef0fdaa14219905aa2d04791219ab11a3ae1