Merge "Update current.txt to reflect result type change" into nyc-mr1-dev