Merge "Snap for 8554636 from 97a3595670c570ce34014f682c6d02a870b95594 to sdk-release" into sdk-release