Snap for 10460766 from 3ae91d9c27e1301538b8f1de59067ddc6e63f0b6 to mainline-healthfitness-release

Change-Id: I237fa7ae3117ba50b894f84a7ce47fa442c62f02