aml_hef_341415040
Snap for 10460766 from 07cccd56b507bb63faad951c5f9f31e0ca46f788 to mainline-healthfitness-release

Change-Id: I5344c79cb9c1cf426e341730ef20a6fdce8797f5