Snap for 6405781 from 6a2d6c4750186f2f02ef08841dc4004f78485314 to sdk-release

Change-Id: Iab410de1feb589661138733c35f78f58fc2b2e2e