Snap for 10786987 from b762da6de53e0f8d720c377060ef5ad74866f729 to mainline-healthfitness-release

Change-Id: Id2ca66106ae4260c5733ce3ca9812eab78b85e5c