Snap for 10460766 from 66c458567d8cebb55887f20c31cb377f0875ce70 to mainline-healthfitness-release Change-Id: I7fe9214373055e6e218ee27fc101e90ae41460a0