Snap for 11587190 from e114ff46c83b6740b8f1b575a4390ffc291005e4 to mainline-healthfitness-release

Change-Id: I80997161062bdb12140aff950cef6e5c2f674e01