Merge "attempt to fix sdk build"