Backed out changeset c0789f4c3113 (bug 863523) for Android no-ion bustage.
CLOSED TREE