Snap for 6405781 from 9e32703e8315575416fa5cc469ba6f3ed70710e4 to sdk-release

Change-Id: I5b96ef1fa3588cbf471a3c4ba9afa3f162ef456a