Snap for 6877830 from 894337e56ea9fdebba9519a72ecb99a9b8212960 to sdk-release

Change-Id: I10752118d7d379c1a64c42ddbf72c0f4412fc146