Bug 937582. r=mcmanus, a=bajaj
Merge b2g18 to v1.1hd. a=merge