Backed out changeset cb67f9c0da24 (bug 978741) for Android bustage.