Snap for 4499105 from 43949e3219e778f86a389df1d9c714151b7c76a8 to sdk-release

Change-Id: I1cf03e4d383d9dfa100cf256117ceeee4d101565