Snap for 10632790 from 4d9ec569f426d8f3a37697c2c72112e6412d3a74 to mainline-healthfitness-release

Change-Id: I21a75ae09c325de901319e695be4d0e0e95a5b18