Snap for 10460766 from 0419b9f2da9a9f813e151256d2f365e19daa5788 to mainline-healthfitness-release

Change-Id: I3432eac98b1106ecf6f9f0ee36514e81ebeaf28a