Merge "Revert "Un-obscure the Telephony phone account ID."" into tm-dev