am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT...
am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
* commit 'af685f3b':
Refactor how timeouts are calculated. (DO NOT MERGE)