Backed out changeset 318da8a0ab90 (bug 1076597) for Android S4 Test failures