Snap for 6686656 from 0d936dd91a0c1ceb4fdbf7dd54df263082782aad to sdk-release

Change-Id: I7ab1ce2cef02c7db60037e5c3fe3815f8e64a762