Merge "ExternalStorageTest: Use a larger timestamp." into rvc-dev