backout b1096811620f (Bug 847279) for android M-8 orange
backout 8e0af273404e (Bug 847279) for android M-8 orange