aml_hef_341415040
Snap for 10460766 from 7d222acae50f5edb964242b1f53d87f28107dd59 to mainline-healthfitness-release

Change-Id: Id7754e63c3f00f62598dd0c446620cc1e1d14271