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

Change-Id: I77ab74b416671af4cd61de2885e312f65a523a8d