bug 835005 - mozilla-b2g18_v1_0_0. r=hwine