Backed out changeset c511e6633686 (bug 962310) for causing Bustage on device and B2G ICS Emulator Builds on a CLOSED TREE