aml_hef_341415040
Snap for 11171363 from 8c5c1d81a95e89ece1aba12216e14854977ced30 to mainline-healthfitness-release

Change-Id: I1fa6493a9ecda712e74c47864914324d2eab3735