Snap for 10460766 from 6615c451a218ef4be8eb3bac1a9b81ba8c25f6f5 to mainline-healthfitness-release

Change-Id: I354694f232503affe2cd489df3b8e15c2ceb8aeb