Snap for 10460766 from f5fc8109a732017aeb779bb2b922caada6098bfc to mainline-healthfitness-release

Change-Id: I5a793ee94676d841bc1437f7cb5c8e5146db51b8