Merge "Fix camera stress tests directory"