Snap for 6686656 from 2712e5727d219ddccacef4e2481d310ce25c7450 to sdk-release

Change-Id: I31bf6cb990714fde4405540a74e081bb471f7dc5