Snap for 10460766 from 494e31177e46ec3b989f569d9fec010fa55df867 to mainline-healthfitness-release

Change-Id: Ie082aa91928f050087325bc3b9da34a694b70acf