Merge "Make shelved_offload_time's help message more specific"