Merge "enforce stricter rules when registering phoneAccounts" into sc-qpr1-dev