Snap for 10460766 from 5ff96d26043478e5a2016f668f796f159df3ddfe to mainline-healthfitness-release

Change-Id: I30e858a27b913e95c2fb2c8cadc0e4c49334239d