Backout 9f5cff5a1a3d and 36cde68b1bf4 (Bug 783059) for Android M-1 Orange on a CLOSED TREE