Back out 27fb990d7fc7 (bug 838374) for Android bustage
CLOSED TREE