aml_hef_341415040
Snap for 10460766 from 4ab9225ca482d85ba3f823ec85b04f078865838f to mainline-healthfitness-release

Change-Id: I61265339a5b60433c0f532592a5e684f89b7d065