Backed out 82bed38ff50a (bug 900551, bug 1015518, bug 846200) due to marionette webapi test bustage on ICS Emulator