Merge "Handle emergency only phone accounts." into cw-e-dev