Merge "Switch network cycle calculation to use Calendar." into nyc-mr1-dev