Update from mozilla-b2g-master