Snap for 10209341 from 3254e69a859db19abdd10746bd8bfed65320ee4d to mainline-healthfitness-release Change-Id: I0647b8297ef3a41d1ffc66cf67b7d1046a6b562a