Snap for 10820752 from 0a6fc67f5269cb3153a78998a97563266c03c4d2 to mainline-healthfitness-release

Change-Id: I25dfe08816bea92e62ed924506370942717e1d77