Merge "Fix setting FdFile::ReadOnlyMode() flag"