Backed out changeset 3357e9e81614 (bug 1086983)
Backed out changeset 17dd668f5444 (bug 1086983) for crashes in Android M-1 Tests