aml_hef_341415040
Snap for 10918580 from 9658f9b13120d76230415e4ef3286d35a9aa4dd8 to mainline-healthfitness-release

Change-Id: I6fbcddb63d504331c51817dc820f7ae7930fc421