Merge "Snap for 11566117 from ff9c0adb6dd6dc100776b29aca8bf7e8a8cf4969 to sdk-release" into sdk-release