Merge "Add a TODO to remove mlsvendorcompat."