aml_hef_341415040
Snap for 10460766 from 49a242811007889d591c9f7322d914d46e9ae669 to mainline-healthfitness-release

Change-Id: Ia2db4522a1b8d2b666ce0345903073fa060beb27