Merge "Snap for 11724015 from a83e6961c8f884f54ff2f6b08ef489d07a6d5d8a to sdk-release" into sdk-release