Merge "Fix embedded build"