Merge "Modify MTP OWNERS file."