Bug 1003993 - FxA System app - remove refs to 'accountId', replace with 'email'