Merge \"Merge \\"Switch network cycle calculation to use Calendar.\\" into...
Merge \"Merge \\"Switch network cycle calculation to use Calendar.\\" into nyc-mr1-dev am: 3a440864\" into nyc-mr1-dev-plus-aosp
am: 54a704bf
Change-Id: I2924d4f96cf0ab52131570a270091d0d9480af0f