Bug 983344. r=sfink, a=dveditz
Backed out changeset 74d4570c3aaf (bug 983344) for bustage.
 Bug 983344. r=sfink, a=dveditz
Merge b2g18 to v1.1hd. a=merge