Snap for 10460766 from 138668cae2394deb5d695c70fe4aa9760c4458ee to mainline-healthfitness-release

Change-Id: If8913d36e7dfa91f59156bbad425a70ffda4e0ed