Snap for 11166233 from 539a419cf93efa512a20c07c2a0e3fbf2bff8bc9 to mainline-healthfitness-release

Change-Id: Ie63b4b5676117f09aad0a268fb3713d6e51a779a