For comparison, see Wilson's pull request at https://github.com/mozilla-b2g/gaia/pull/16959
There were other problems with that one -- it was missing some changes, but I worry that this one is missing some changes that that one had.