Merge "Make sure mms proxy is hostname" into tm-dev