aml_hef_341415040
Snap for 11047303 from 81c0c14b1a92e9093ced9b842a92e23b8ea18bbf to mainline-healthfitness-release

Change-Id: I528499420a79c199b7e5cd280ad3e8b07437a583