Merge "Fix NPE for tasks without a subId" into nyc-mr1-dev