Revert "Trimmed the branch to only the core/mk sub directory"

This reverts commit b34569daa02ce3ef70fa57b4f054cdca4aa6fc92.
Rebase from 'upstream'
Trimmed the branch to only the core/mk sub directory