Merge "Make test_options.timeout an int64"
am: 9a2d64872b

Change-Id: Idc79fb957d452b833b5f6e95feaf21aa4caa2658