Snap for 11619363 from a2c07a2b0f114fb502f7dec796120b86241e87bf to mainline-healthfitness-release

Change-Id: Ib2684e9bb23d0376a1d10721e7f34412fdfa6dfb