Merge "Remove timeout support." into gingerbread