Merge "Snap for 6660490 from c436e2f2a7dd793db46ab8d7fd48259b2a0631e8 to sdk-release" into sdk-release