Snap for 6686656 from dd282ae725d193f409927adbc2ee7190ea247834 to sdk-release

Change-Id: I8125a46739266756c5913129a5070c8baa250fd5