Wrap to 80 characters
Make changes according to pull request comments

See comments in pull request #13411
https://github.com/mozilla-b2g/gaia/pull/13411