Back out 4dd5fb21e599 (bug 906199) for Android R2 orange
CLOSED TREE