Backed out changeset ffe561bb22e5 (bug 928370) for Android talos bustage.
CLOSED TREE
Automatic merge