Merge "Fix SDK build" into master-nova