Merge "Fix NPE in Call.setHandle" into nyc-mr1-dev