Merge "Snap for 5949240 from e9dfdaa239e44fef857768819176474df9b58098 to sdk-release" into sdk-release