Merge "Snap for 4499105 from aeb0df532cb8cc5a7de4801ec0d646642a5d1548 to sdk-release" into sdk-release