Updates from mozilla-b2g/gaia/master