Merge "Remove subtle dependencies" into nyc-mr1-dev