Snap for 10460766 from b1192c64bf6523901be5732449f2318a77fb652a to mainline-healthfitness-release Change-Id: I77cf36d65d912f95fe94c681d2814e95965a32a2