Snap for 6660490 from 01553a27989ebcb915bb80dedf9d49b06ed41867 to sdk-release

Change-Id: I285c4e3cb5defac4f76f2e46cf9efe2b9dec7527