Back out a5a5d2c176f7 (bug 882865) because of Android test failures on a CLOSED TREE