Merge "Fix broken test and in-call controller bug" into nyc-mr1-dev