aml_hef_341415040
Snap for 10918580 from 92e895f219d15479a5cb6b7911117898a4c4b614 to mainline-healthfitness-release

Change-Id: I9eaa85d4d2d99f7712ee0bf8f83fd6aa3533fd5d