Snap for 10460766 from e80cf191495cad6788c19ecd42b51ceb25598021 to mainline-healthfitness-release

Change-Id: I13a56e7d818bdca26a8af18a14a8d6a6d3ac30d3