Also fix style to make it match local style. MozReview-Commit-ID: D2HTik6HwxJ --HG-- extra : rebase_source : 73d5a6d63597764d904f2d254ced08192871fdc0