Snap for 6686656 from ba7bc9e4b24336e6e1a4167ead495fc5a3c553ba to sdk-release

Change-Id: Ibec1d713405bea39e55da98b63db7dfc98629f9f