Snap for 10460766 from a842690e18d829a232afbaa225febbcfd0bb4acf to mainline-healthfitness-release

Change-Id: I257b9386f808f95981bea1d60563c9856f31d3db