Bug 934000. r=mrbkap, a=akeybl
Merge b2g18 to v1.1hd. a=merge