Backout c1e84483fc87 for Android bustage