Merge "Remove orphan methods in PhoneInterfaceManager" into tm-dev