Merge "Merge \"Switch network cycle calculation to use Calendar.\" into nyc-mr1-dev am: 3a4408640a" into nyc-mr1-dev-plus-aosp