Merge commit '06abd0a6a833beda1c0e68aed44912d145745a42' * commit '06abd0a6a833beda1c0e68aed44912d145745a42': Attempt to fix the SDK build
Merge commit '06abd0a6a833beda1c0e68aed44912d145745a42' * commit '06abd0a6a833beda1c0e68aed44912d145745a42': Attempt to fix the SDK build