Snap for 10460766 from c0438ec28ba523605b760eb04ee945835cd067b9 to mainline-healthfitness-release

Change-Id: I049a6989c0ecb8d05d0b56beefd48553f211abd1