Merge "Make mtp enforcing."