Merge "Set correct project id for sdk data directories"