Backed out changeset a4dd0dc4e354 (bug 824652) for Android M1 orange.