bug 958202 - back out ef0cb3ea6ab0 (b2g fota)