Bug 984486 - FxA System app should support both 'accountId' or 'email' fields