Bug 991812: B2G Fixups CLOSED TREE. r=me