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