DON'T MERGE - try testing android in sauce again