Snap for 11200902 from e8a95e8bc58ca46b51eaee46cc63b954a2a6975c to mainline-healthfitness-release

Change-Id: I9d064f27d0f639e2f776c8beea9b091a449b56bc