Merge "Snap for 7110675 from 59c736f9a99486f3bf29cbdae4a3845cd4e6ac3c to sdk-release" into sdk-release