Backout 80e1116e4599 for Android failures on a CLOSED TREE