Merge "enforce stricter rules when registering phoneAccounts" into tm-dev