Merge "Implement a max time bound for rotation.  (DO NOT MERGE)" into ics-mr1