Snap for 6877830 from a0721a1d9a02cd6cdc13197bdb9ffbb3cd1d8958 to sdk-release

Change-Id: I88c4d085afa65e43f50325d09c6c4351ec210ccf