Snap for 10460766 from e42826f89aed464d3b8555b4ba6755d599116c31 to mainline-healthfitness-release

Change-Id: I3fe9f5ab337ea55ca57d0b7477bd98682b5cad1e