Merge "Snap for 6877830 from 34ceafe3509b986c569c46028a2bb49bc4ea3ec7 to sdk-release" into sdk-release