Backed out changeset cac24f45f415 (bug 1075531)
Backed out changeset 2b027c3e1736 (bug 1075531) for Android S4 Test Failures