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

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