Snap for 10460766 from be06080469b07fcb205eb07ac2c795821e1bfcdc to mainline-healthfitness-release

Change-Id: I295a0535a72ac56cbd2062b12bb64e612f645e43