aml_hef_341415040
Snap for 11166233 from 3255d59c03ace580cdfd13a4046a026c23b16cad to mainline-healthfitness-release

Change-Id: Ic0c343456184af8efeb7749cb9cd46f9c5655e61