Merge "Snap for 9979206 from e5554d04091016fee1d820d6012ec93a265431a8 to sdk-release" into sdk-release