Snap for 10460766 from edb1c8267639381376502a7a8690838ce63632b7 to mainline-healthfitness-release

Change-Id: I95002c4c8eb36ac9e8541787f2217a58f1cdb8a8