am 1bc82792: (-s ours) am ad1f4a2c: Merge "Implement a max time bound for...
am 1bc82792: (-s ours) am ad1f4a2c: Merge "Implement a max time bound for rotation. (DO NOT MERGE)" into ics-mr1
* commit '1bc82792':
Implement a max time bound for rotation. (DO NOT MERGE)