Merge "Move mtectrl to private"