Automatic merge from submit-queue

Add a check for file size if the reading content returns empty

In order to debug the flaky tests for writing/reading files via
contains, this PR adds a check for file size if reading returns empty
content.