Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2