Snap for 11651058 from b4480edabfc896898ac3a4d89a3578d7567d0f7a to mainline-healthfitness-release

Change-Id: I2d43a91c258a617b2d7789d5aa4a1746dcac6a8d