Merge "Snap for 7550740 from e6d7b58981ca14d70dfec1b8b51c2b2f34060de0 to sdk-release" into sdk-release