Snap for 10460766 from 433b520f3be28b80af427745980cb03d659d0016 to mainline-healthfitness-release

Change-Id: I6bf5392ce89ac47e7f2fbca479b5704c62ca3b44