Backed out changeset c45f715f529c (bug 1067229) for ICS M8 Testfailures