Backed out changeset bce2fc00ba0e (bug 838332) for Android M8 Test failures