Snap for 10209341 from 3a87865f29c9ff1b8718da9112992b1d1a0738ae to mainline-healthfitness-release

Change-Id: I308161a6094a5e32213cee55a591f6263dbec0bf