Backed out changeset d462269d88a9 (bug 1065855) for Android M5 Test failures
Backed out changeset 170ce237e4a0 (bug 1064705) for Android m5 Test failures