Snap for 10460766 from 130dee380511d71679dd56028cef257442bae0a4 to mainline-healthfitness-release

Change-Id: I74820db6e18d64e327e4891203cd298ea5f43da9