Snap for 6877830 from 055cc0b1fa49cc9975c91a44a0071fa72af5eea7 to sdk-release

Change-Id: I6e051a76906b9ce53217bffb776d0ef99e661bde