Merge "Snap for 5590969 from d2d7ace44bcbe8cf08a0fb72f8ae5e1adbae5e65 to sdk-release" into sdk-release