backout 1458740cfd92 and 833978b3dadf (bug 700022) due to android-R4 and b2g-R10 orange