tagging B2G_1_1 for mergeday. r=a=mergeday. DONTBUILD
Merge b2g18 to v1.1hd. a=merge