Snap for 10632790 from 280cba8598e6688da666fb918877cbc2fc1f884a to mainline-healthfitness-release

Change-Id: Id28d6968e07eab713d69cff2afe9ddadda8daee8