Merge "Create sdk directory for an app only if app consumes sdk" into tm-dev